Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add function ldap_enable_debug () (bp #453) #454

Merged
merged 3 commits into from
Mar 10, 2021
Merged

Add function ldap_enable_debug () (bp #453) #454

merged 3 commits into from
Mar 10, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 10, 2021

This is an automatic backport of pull request #453 done by Mergify.

Cherry-pick of 5ea6c68 has failed:

On branch mergify/bp/master/pr-453
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 5ea6c68.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@timopollmeier
Add CHANGELOG message for ldap_enable_debug
ab9281b 
(cherry picked from commit 5ea6c68)

# Conflicts:
#	CHANGELOG.md
@timopollmeier
Add function ldap_enable_debug ()
c6eab50 
This function enables LDAP debug logging via the glib logging, which can
be used for debugging LDAP connection issues, for example.

(cherry picked from commit 3c77434)
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Mar 10, 2021
@timopollmeier
Resolve CHANGELOG conflict for ldap_enable_debug
aa124be 
The "Added" subsection for 20.8.2 was missing, so the entry
could not be added there.
@timopollmeier timopollmeier merged commit 26b762c into master Mar 10, 2021
@timopollmeier timopollmeier deleted the mergify/bp/master/pr-453 branch March 10, 2021 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timopollmeier timopollmeier timopollmeier approved these changes

@ArnoStiefvater ArnoStiefvater Awaiting requested review from ArnoStiefvater

@jjnicola jjnicola Awaiting requested review from jjnicola

Assignees
No one assigned
Labels
conflicts This backport pull request has merge conflicts that need to be resolved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@timopollmeier